From 8fe9e65cb458e257c4515e2afe80104c0622247b Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 1 Oct 2008 14:07:17 +0100 Subject: [PATCH] xend: Fixes after backend xenstore config changes. Signed-off-by: Keir Fraser --- tools/python/xen/xend/XendDomainInfo.py | 6 +++--- tools/python/xen/xend/image.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index bad2723290..f48ac541b9 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1208,8 +1208,6 @@ class XendDomainInfo: return xstransact.Write(self.vmpath, *args) def _removeVm(self, *args): - if len(args) == 0: - self._removeVmPath() return xstransact.Remove(self.vmpath, *args) def _gatherVm(self, *args): @@ -1778,6 +1776,7 @@ class XendDomainInfo: self._releaseDevices() # Remove existing vm node in xenstore self._removeVm() + self._removeVmPath() new_dom_info = self.info.copy() new_dom_info['name_label'] = self.info['name_label'] new_dom_info['uuid'] = self.info['uuid'] @@ -2358,7 +2357,7 @@ class XendDomainInfo: paths = self._prepare_phantom_paths() - self._cleanupVm() + self._removeVmPath() if self.dompath is not None: try: xc.domain_destroy_hook(self.domid) @@ -2375,6 +2374,7 @@ class XendDomainInfo: self.cleanupDomain() self._cleanup_phantom_devs(paths) + self._cleanupVm() if "transient" in self.info["other_config"] \ and bool(self.info["other_config"]["transient"]): diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 15605903df..82d64afc49 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -502,7 +502,7 @@ class ImageHandler: if fifo_fd >= 0: self._openSentinel(sentinel_path_fifo) os.close(fifo_fd) - self.pid = self.vm.gatherVm(('image/device-model-pid', int)) + self.pid = self.vm._gatherVm(('image/device-model-pid', int)) log.debug("%s device model rediscovered, pid %s sentinel fifo %s", name, self.pid, sentinel_path_fifo) self.sentinel_thread = thread.start_new_thread(self._sentinel_watch,()) -- 2.30.2